Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 21:32:21 +0000 (14:32 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 21:32:21 +0000 (14:32 -0700)
commitd389e738abf200f3d2268582cfb35de205f64ee0
tree37c6bdb935e7ed6f19131c36cfb1b7004803e3e1
parent6107b53be497f57d478bc436364b5f972adb30a8
parent8cb1fdbdbba97a756e0f81c6b7ac27b05876af1b
Merge from trunk.